Handle crossword articles #12925
Open
Handle crossword articles #12925
+755
−27
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Size Change: +11.6 kB (+1.24%) Total Size: 953 kB
ℹ️ View Unchanged
|
sndrs
force-pushed
the
e2e/add-react-crossword
branch
from
0789e74 to
8a244f7
Compare
sndrs
force-pushed
the
e2e/add-react-crossword
branch
from
2e7e45f to
3fe07f7
Compare
sndrs
requested review from
oliverabrahams and
JamieB-gu
and removed request for
a team
JamieB-gu
reviewed
Dec 11, 2024
sndrs
commented
Dec 11, 2024
sndrs
commented
Dec 11, 2024
sndrs
commented
Dec 11, 2024
sndrs
commented
Dec 11, 2024
sndrs
commented
Dec 11, 2024
sndrs
commented
Dec 11, 2024
sndrs
commented
Dec 11, 2024
github-actions
bot
added
apps-rendering
and removed
run_chromatic
this is a first pass, it needs work
and use JSdoc for editor assistance
sndrs
force-pushed
the
e2e/add-react-crossword
branch
from
bf139e7 to
8c33976
Compare
github-actions
bot
removed
the
run_chromatic
JamieB-gu
reviewed
Dec 13, 2024
| import { Crossword as ReactCrossword } from '@guardian/react-crossword-next'; | ||
| import type { CrosswordProps } from '@guardian/react-crossword-next'; | ||
|
|
||
| export const Crossword = (data: CrosswordProps['data']) => ( |
There was a problem hiding this comment.
Are you considering data to be the "props" to this component? So that each property in the data object is a separate prop that can be passed individually?
| @@ -50,6 +50,7 @@ | |||
| "@guardian/libs": "19.2.1", | |||
| "@guardian/ophan-tracker-js": "2.2.5", | |||
| "@guardian/react-crossword": "2.0.2", | |||
| "@guardian/react-crossword-next": "npm:@guardian/[email protected]", | |||
There was a problem hiding this comment.
Is the plan to merge this PR with the preview version of the dependency in use?
| } | ||
|
|
||
| const element: CrosswordElement = { | ||
| _type: 'model.dotcomrendering.pageElements.CrosswordElement' as const, |
There was a problem hiding this comment.
What does the as const do here?
| let article = enhanceArticleType(frontendData, 'Web'); | ||
|
|
||
| if (article.frontendData.crossword) { | ||
| article = enhanceCrosswordArticle(article); |
There was a problem hiding this comment.
Is there a way we can run this as part of the other enhancers, i.e. within the enhanceArticleType function?
I think the net effect of this function is to append a new block to the article? Therefore it could perhaps live in the enhanceBlocks function? That's the place where modifications to the blocks are typically handled.
dotcom-rendering/dotcom-rendering/src/model/enhanceBlocks.ts
Lines 98 to 115 in 411e928
Alternatively, it could be concatenated onto the result of that function within the enhanceArticleType function, whenever a crossword is present.
dotcom-rendering/dotcom-rendering/src/types/article.ts
Lines 43 to 49 in 411e928
|
|
||
| return { | ||
| ...article, | ||
| format: { ...article.format }, |
There was a problem hiding this comment.
This is perhaps not needed now that we're not longer modifying format?
Suggested change
| format: { ...article.format }, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
based heavily on the work done by @andrew-nowak in #12511, this is first pass of getting crosswords working in DCR.
it does not include layout changes, because there's work to be done in CAPI client and frontend to support that.
those will come in #13001.